Clarify and fix construction of foreign key column names #1324
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The default version is the behavior that existed so far: The back reference is the table name as generated by the `NamingStrategy` without taking `@Table` annotations into account. The new alternative is to take `@Table` into account. The behavior can be configured by setting the `foreignKeyNaming` property on the `RelationalMappingContext`. Closes #1161 Closes #1147
See #1162
mp911de
force-pushed
the
issue/1147-fk-naming
branch
from
94e31cf to
88485c1
Compare
Do not expose setForeignKeyNaming methods on NamingStrategy to make less assumptions about how a naming strategy gets implemented. Provide getRequiredLeafEntity method on PersistentPropertyPathExtension to reduce null and state assertion checks. Refine getTableName/getQualifiedTableName approach to reduce API surface and avoid deprecations.
mp911de
force-pushed
the
issue/1147-fk-naming
branch
from
88485c1 to
c407ff0
Compare
schauder
commented
Oct 6, 2022
| @@ -778,8 +777,8 @@ void selectByQueryValidTest() { | |||
| String generatedSQL = sqlGenerator.selectByQuery(query, parameterSource); | |||
| assertThat(generatedSQL).isNotNull().contains(":x_name"); | |||
|
|
|||
| assertThat(parameterSource.getValues()) // | |||
| .containsOnly(entry("x_name", probe.name)); | |||
| assertThat(parameterSource.getValues()).hasSize(1) // | |||
There was a problem hiding this comment.
I really don't like this change. It does essentially the same assertion but in two pieces. I find the original version clearer and easier to understand.
There was a problem hiding this comment.
Let me roll back those changes to simplify things.
| * The fully qualified name of the table this path is tied to or of the longest ancestor path that is actually tied to | ||
| * a table. | ||
| * | ||
| * @return the name of the table. Guaranteed to be not {@literal null}. |
There was a problem hiding this comment.
This should also have a since annotation, shouldn't it?
| .map(Table::schema) | ||
| .filter(StringUtils::hasText) | ||
| .map(this::createSqlIdentifier)); | ||
| this.tableName = Lazy.of(() -> Optional.ofNullable(findAnnotation(Table.class)).map(Table::value) |
There was a problem hiding this comment.
We should protect these line breaks with comments.
|
|
||
| RelationalMappingContext mappingContext = new RelationalMappingContext(); | ||
| private RelationalMappingContext mappingContext = new RelationalMappingContext(); |
There was a problem hiding this comment.
I thought we don't make stuff private in tests.
There was a problem hiding this comment.
We have no strong guidance about private/non-private. This is mostly an effect of the JUnit 5 migration aid that reduces visibility to the lowest possible visibility requirement.
mp911de
changed the title
mp911de
pushed a commit
that referenced
this pull request
Oct 7, 2022
The default version is the behavior that existed so far: The back reference is the table name as generated by the `NamingStrategy` without taking `@Table` annotations into account. The new alternative is to take `@Table` into account. The behavior can be configured by setting the `foreignKeyNaming` property on the `RelationalMappingContext`. Closes #1161 Closes #1147 Original pull request: #1324.
mp911de
added a commit
that referenced
this pull request
Oct 7, 2022
Do not expose setForeignKeyNaming methods on NamingStrategy to make less assumptions about how a naming strategy gets implemented. Provide getRequiredLeafEntity method on PersistentPropertyPathExtension to reduce null and state assertion checks. Refine getTableName/getQualifiedTableName approach to reduce API surface and avoid deprecations. See #1147 Original pull request: #1324.
|
That's merged and polished now. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes 2-3 issues, depending on counting.
Only parts of it should be back ported.
The first commit "The back reference generation is now configurable."
Closes #1161.
Technically it also closes #1147, which asks for documentation of the current state.
This should get back ported at least to 2.4
The second commit "New default behaviour for back reference naming." switches the default behaviour.
Closes #1162
Since this is a breaking change it should not be back ported.
Sorry for the confusion.